Measure payload only when EXTENDMR is not set #618
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gaojiaqi7
force-pushed
the
1103/measure_payload_conditionally
branch
from
38e73d5 to
7e9a3c5
Compare
jyao1
reviewed
Nov 3, 2023
td-shim-tools/src/metadata.rs
Outdated
| @@ -234,7 +234,7 @@ pub fn default_metadata_sections(payload_type: PayloadType) -> MetadataSections | |||
| memory_address: TD_SHIM_PAYLOAD_BASE as u64, | |||
| memory_data_size: TD_SHIM_PAYLOAD_SIZE as u64, | |||
| r#type: TDX_METADATA_SECTION_TYPE_PAYLOAD, | |||
| attributes: 0, | |||
| attributes: 3, | |||
When `MR.EXTEND` is set to `1`, payload section will be extended to MRTD, otherwise it will be measured and extended to RTMR[1] by td-shim. Signed-off-by: Jiaqi Gao <[email protected]>
gaojiaqi7
force-pushed
the
1103/measure_payload_conditionally
branch
from
7e9a3c5 to
84505d4
Compare
dimakuv
suggested changes
Nov 6, 2023
There was a problem hiding this comment.
The PR doesn't work for me. (Maybe I'm doing something wrong?)
Please see #617 (comment)
Payload should not be measured by td-shim if the `EXTENDMR` is set in metadata attribute. Signed-off-by: Jiaqi Gao <[email protected]>
gaojiaqi7
force-pushed
the
1103/measure_payload_conditionally
branch
from
84505d4 to
5c71692
Compare
dimakuv
approved these changes
Nov 6, 2023
jyao1
approved these changes
Nov 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #617